Skip to content

CNV-87842: Update docs for disableContainerInterface - #115690

Merged
abrennan89 merged 1 commit into
openshift:mainfrom
abrennan89:CNV-87842
Jul 21, 2026
Merged

abrennan89 merged 1 commit into
openshift:mainfrom
abrennan89:CNV-87842

Conversation

@abrennan89

@abrennan89 abrennan89 commented Jul 17, 2026 •

Copy link
Copy Markdown
Contributor

Version(s):
From Jira: 4.12 all the way to 4.21 but this is also marked as 4.22.z, so I will fix it in all supported branches (4.16+)

Issue:
https://redhat.atlassian.net/browse/CNV-87842

Link to docs preview:
https://115690--ocpdocs-pr.netlify.app/openshift-enterprise/latest/virt/vm_networking/virt-connecting-vm-to-linux-bridge.html

QE review:

  • QE has approved this change.

Additional information:

@abrennan89 abrennan89 added this to the Continuous Release milestone Jul 17, 2026
@abrennan89 abrennan89 added the CNV Label for all CNV PRs label Jul 17, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 17, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 17, 2026 •

Copy link
Copy Markdown

@abrennan89: This pull request references CNV-87842 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 17, 2026
@abrennan89 abrennan89 changed the title [WIP] CNV-87842: Update docs for disableContainerInterface CNV-87842: Update docs for disableContainerInterface Jul 20, 2026
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 20, 2026
@openshift-ci openshift-ci Bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 20, 2026
@openshift-ci

openshift-ci Bot commented Jul 20, 2026

Copy link
Copy Markdown

@abrennan89: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@abrennan89
abrennan89 requested a review from yossisegev July 21, 2026 14:37

@yossisegev yossisegev left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

@erpeters157

Copy link
Copy Markdown
Contributor

LGTM!

@abrennan89
abrennan89 merged commit ad61e4e into openshift:main Jul 21, 2026
2 checks passed
@abrennan89

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-5.0

@abrennan89

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.22

@abrennan89

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.21

@abrennan89

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.20

@abrennan89

Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.19

@openshift-cherrypick-robot

Copy link
Copy Markdown

@abrennan89: new pull request created: #116046

Details

In response to this:

/cherrypick enterprise-5.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@abrennan89: new pull request created: #116047

Details

In response to this:

/cherrypick enterprise-4.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@abrennan89: new pull request created: #116048

Details

In response to this:

/cherrypick enterprise-4.21

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@abrennan89: new pull request created: #116049

Details

In response to this:

/cherrypick enterprise-4.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@abrennan89: #115690 failed to apply on top of branch "enterprise-4.19":

Applying: CNV-87842: Update docs for disableContainerInterface
Using index info to reconstruct a base tree...
M	modules/virt-creating-linux-bridge-nad-cli.adoc
M	modules/virt-creating-linux-bridge-nad-web.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/virt-creating-linux-bridge-nad-cli.adoc
CONFLICT (content): Merge conflict in modules/virt-creating-linux-bridge-nad-cli.adoc
Auto-merging modules/virt-creating-linux-bridge-nad-web.adoc
CONFLICT (content): Merge conflict in modules/virt-creating-linux-bridge-nad-web.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 CNV-87842: Update docs for disableContainerInterface

Details

In response to this:

/cherrypick enterprise-4.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CNV Label for all CNV PRs jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants